Added dependencies and a bunch of other stuff