Added some spy classes and a bit of states