Major changes to code. -asherlaw

All files are now included. This is the latest version