Chad pr/342

some ideas for @chadhietala