Initial commit
Resolve merge conflicts
Tweaks before LXJS