placeholders
added trappers
added titles
Merge branch 'extra-butts'