Added some todo's and finalised structure.