Lifecycle stuff is working with a few caveats