Initial attempt to convert from procedural to OO
Update README