Updated TODO now that some items have been completed
Refactoring config class code to ensure it is neater and more reusable