Moving dependencies around, G+ WIP