Tidied up everything. All that's left is the final/draft configurations, and a user login