commit some wip
lets do the puppet one later