initial commit for major features