Tidied up source code; began gluing components