Feature/prep for publish