initial commit

after fixin bugs