Shuffling Pod and notes.
Stab 4 at getting Travis build to pass.