WIP: (Much) better oct support