Last commit of the night. TODO 1 & 2 done?