Changed layout to what we want
added database stuff
New Michael and Bill changes