Final commit for a while so Colin can look over stuff