Changed everything back to the original system.

No more static polymorphism.