starting to move stuff over to new o model