committing everything so far
Merge remote-tracking branch 'refs/remotes/letsmod/master'