Revert "With some new developments - #5, #6, #8"

This reverts commit d1917a581df51ca8d7244611ed2b8fb65c27650e.