Almost there, some lighting tweaks pending