Put all trusty stuff to separate branch