done for the night, can't make progres until that null pointer error with the DB is fixed