Deserialisation and refactor of code splitting up work of main class
Testing
Testing