latest changes, will finish up tonight