Additional updates from initial build out