Moving code around to get an idea of how it should/could look.