Base management (15/21)

Base management