Starting to stub out collapse/expand functionality
no changes
improved transitions, collapse, update