Feature/reaper

please review