Full on rebase. Fixed all  kinds of strange issues that came about