added in a bunch of shit
added missing Base file for tests