Spent half the weekend modding this

First is after, second is before.