making Josh's work

^
Also, commented out the database so i can run it as of now