initial commit of current implementation