Bug fix
Change: OO design (WIP/not yet tested!)