Fixed: Second to Last commit was a giant rewrite!