Changed alot, added a lot!.
The basic functionality works!