Revert "Base"

This reverts commit d7c5a6b810facf5470fd0052586f3000dabde717.
Alpha 1.1