added comments + todo's