pretty much done... still a couple minor details to discuss/I need help on...