I've caught a cold so work has been a little slower than usual. Will try to finish this in the next handful of days!