[DO NOT MERGE] Fixed @smarterclayton's comments from #384 part 2

Still WIP, do not merge without my approval!