Moved to contrib/ in preperation for merge