added variable declarations back in + rough versions of facility declarations. Capitalization needs work with facilities -- most likely can be handled in the view with ST 'lower()' method