Removed most of the require stuff.  Knew there was a reason I didn't like this.