first commit

not properly working yet