Work to split key binds correctly and to start organising the project better
Todo list added