Working on standalone
More work on standalone
Merging work on standalone