fixup! fixup! fixup! fixup! [WIP] refactor data types into classes