almost ready to test..almost