Updated to give fully functioning initial build