Looks neat! Apologies for the hackathon code, there will eventually be a fully rewrite done ;-)!