Finished OOSE part of #40
Merge