this is clean now except for the piddler/ruby dependencies