Restructured functions, added in TODOs and general comments
Added in module plan and open questions