Finished my part, @Irredeemable is just going to polish off the last details and then we can move on!