WIP WIP WIP

TODOs
TODOs everywhere
WIP