Init commit of universal version

Work in progress...