Added some commented out testing