Revert "Rebuilt from Daniel's"

This reverts commit a4de7262238f552cf92a0c4a654f06b2243c5c89.
Reverting to before DB addition

Will decide how to add DB so all users will have access