Some changes
Fixed merge errors
Trying to add a helper function
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
More testing with fog and drag and drop