Redid s3 process. Added in a database. Closes #19 #18 #3