Added IP2 and IP8 + statetracker State
#400

JoschD wants to merge statetracker_state into master

We do not currently have an analysis of these two commits