merge initial build stuff