WIP - Added some todos