spencer's initial commit
merge from initial local fixes