last commit before serious streamlining
monday edits