Re-enable these guys
Don't seem to need this any more
Don't enable folds for now
Some stuff from Amadeus
Don't want this any more