Revert "working basic"

This reverts commit 4231bce8da8d9eebb839ffda672576b89408450e.
changes?