Removing Base

Adding more updated codebase.