Added some stuff
Merge branch 'testing'