finished most of q3 - need to adde suggestions by craig
testing added