WIP : Rewriting with classes