progress
should have done this days ago
oops
merge