pretty much done coding
now testing