fogowar progress
merge asdf