Start some work on the rewrite, just the beginning! :)