Guildhall

Merging in the guildhall changes. May not delete, and keep working on this to improve, not sure.