Getting progress started again. Large rewrite and cleanup, I wasn't liking the direction I was taking previously and am going to try something else.