10/23/15
here is more progress made