Moved around, added resource manager