pulling eric figaro
Merge branch 'atweak'
dont remember what i was doing
updated figaro implementation