sooo yeah

minimal progress, but progress