-attempting to object-ify
-currently broken!