added first implmentation
some changes..?