Fix and add mock black box
Initial start on plan refactor
Merge violasong changes