major overhaul, still in progress (going to sleep)