started owrkin on new collapser
merged changes