OOP rewrite

[waldyrious]

There are currently two unmerged branches in this repository, oop and oop-rewrite. We should probably look into whether we want to complete that work, drop one or both of them in favor of the current approach, mark them as "up for grabs" to attract contributors, or some other outcome.