@moorepants @fitze Please have a look at it and comment.