Redo again

1. There were significant issues with the previous code writing
2. There were also significant issues with the previous planning