some more progress...
URGH