Merged an update of the level builder from the other repo.