saturday night progress
major overhaul to code