Added some more dependency methods, starting to figure out how things need to be done (Bug #84)