I made a mess of my repo... Also, todo list