More work on World Builder