WIP-Puma

Puma- This is a work in progress