* More work at making this a distributable package