A36507 V.0.2.2

Added some testing code and removed unused files