Initial push
Merge https://github.com/ColossalAmbition/Lucidity