Comments and todo's added