Everything but Tests

Working on fixing my tests now