BaseMaster first commit