Peas in a

just prepping this for merge, place to look/review at changes