Changed structure and re-factored code.  Need to re-factor application code tomorrow.