ready for testing; commennted out where I'm still working
file to be deleated or expanded on latter