Wui Revamp

Inheritance is so much better, code cleaner, smaller :-)