Updating the todo with my progress, adding the things that should have been there earlier.