Will address in a cleanup (this is addressed in another branch #11)--there are a few variables throughout that have been around from the initial push that need some fixing.