Database

Database needs to be redesigned