progress

appears to be working, need to clean up still