Some work on derivations, removed some junk