fixed more bugs, updated database schema, about to do some heavy lifting with the logic