Complete rehaul, simplified logic to a single class, completely
commented logic