Final commit before massive rewrite!