Re-structured pieces and added heat map logic

Cleared up and solidified Generics and inheritance. Set current heat map
logic.