Build successful now. Many functions left to be implemented and more cleaning up left to do