Added current status and TODOs