Initial commit of modified files based on Scott Herbert's original code