Replaced OO with decorator pattern.
Major bug fixes throughout.
Added new UI capabilities.