interim commit; adding shiz for change handlers