Added missing dependencies; Wondering about // TODO: I have no idea what this is