Added some code, did a lot of planning