Base management (17/21)

Base management