Extensive work on following dependencies for functions. First tests passing. Needs much more tests