Fixed: Last commit was a giant rewrite!