Refactoring nearly finished

Deleted old functions, Commented new ones etc..
Starting to read ASDD paper now