[alex][mehlcat-dev] second attempt at PR

Leave comments as necessary and merge when ready