Started work on functional controller testing, saving an intermediary point in the new organisational structure