Josh's branch for HTML5 Citadel