Made a lot of changes, mostly moving things I was trying to store in
session to DB Models.