Merged some files, connecting database to front-end