just getting this to github. boy is it a mess
merge