Separate meta from bodies

not ready for review yet, still needs tests