Create classes with Object.const_set and Class.new

I was reading through the code and saw these two 'TODO's, so I updated them.