Peppy poppy | ajt

Busy day changing some code around - the original was a bit complicated but I'd made it in a modular fashion - so changing it all around...