Updated configuration fetching
Added configuration and rejiggled some stuff
Removed testing code and started putting together the different layers