Add finishing touches to #19.. need to add databasefield