initial merge with Stephen's stuff and added an insertData.sql file to populate some data.