First pass at a Lucid build version
Tweaks to try and get the deps right