Change the interaction model to work with more vague types

[4Kaylum]

I know for a fact that context commands are.......... iffy.

[4Kaylum]

I THINK I've done this now.