Still building foundation
Small changes