Todo updated as I finished 1 thing + adding 2 things