commit & push of stuff I had done local only a while ago.. TBD with efactory