True Initial Commit

Most of this is pre-winmerge