Finished loading from files and fixed up general structure (in theory)