some test stuff just stashing
incorporating new changes
updated look, renamed files for clarity, updated tests reflect changes.  Removed locations display from front page