Been working on the two pages concurrently, making decent progress. Expect an update later this week!