made more progress! almost done I hope...