Added dependencies, ready to merge back