first commit, untested OI
second commit, untested OI. actually has a constructor this time!
Merge origin/master