Added some todos
Updated build