Put stuff together and fix bugs