Revert "Removed some stuff and added todo's"

This reverts commit 3a556041b9145fec08cc7fdbcbb02244ac10e667.
Worked on maps for no reason