Temporary rework

Due to creative bugs, Code is been re-done one item at a time.
This commit has the deletation of the old code and the new one.