Merged in Chad's Tower files