Added resource manager; And probably other things I forgo...