Commit #25.3

- Fix: Tried fixing the Connection to the Database. Still needs to be
reviewed later...