adde stuff
merge
added expandables