Base management (19/21)

Base management