uh oh
fixed conflict in functionexp
ok, definitions back in -- keep going tonight...