Pushing all the recent changes, added database and some single page goodness