* Basic rewrite done
* All features seem to work