Did an almost complete rewrite of the features that were done before

[n1ght4ngel19]

Reason: The implementations before were really hard to change, maintain, and didn't quite cover the cases needed for this stage of the game.