Once again, loads of refactoring. Decided to go with JSON configuration
files