Refactor to make best use of extensions

[nickholt-driver]

Look at the existing code and investigate / refactor how I can use extensions for architecture, modularity and readability.