serious update from previous, added fully functional DB