Re-arrange how base works