Done!! final testing on sunday afternoon