Base management (18/21)

Base management