Rebase sg

Once the new manger is done I'll do the refactor :)