Moved seperate classes into context. Removed base. Need to rewrite tests.