A first cut at Wagn -> Decko rename and some Engine stuff