Revert "Polymorphic situation, needs attention"

This reverts commit 94f0f20dd3695dc6aa498f9ab495874eef02833e.

Reverting to previous commit
begin repairing previous commit