Work in Progress - Refactor of Base