New changes

New changes to from Stephen
New database changes
New changes
Merge pull request #4 from stevkky/master

New changes that might help