Major update on new database implimentation