First readthrough done. Added TODOs where code must be added