1st commit

1st commit, developing, not complete