Reorder code, add sections
Add bunch of scope pickers, selectors and stuff