More work and some work I managed to not commit.