Work In Progress

Fixes a variety of lifetime errors in various places