Updated with Comments

Still need to integrate into test.php