working version
consolidated into a single webapp