Finally updated stuff. Haven't tested. Creating the test to mock the database next.