Figured out how to reference Base

Also cleaned up imports and unused code