Separate meta from bodies

ready for review

* [x ] Add tests