Resource split

Note: mistakenly didnt have this off of develop so it has some of the previous PR in it. 

Fixes #445