completed more base stuff