changed and added stuff to catch up after debacle... still on day 18-19 or something