progress prior to native refactor