Moved around some reqs, got rid of attr_accessor, added a few more methods