Initial commit of the new code
Merge https://github.com/varunratnakar/wings