Alright, now that #122 is in, any more concerns regarding this PR?