organize/expand #1

Closed
Abhiram wants to merge 3 commits from organize/expand into danielv2

3 Commits