updated to new Actor.setSource logic
restructured to facilitate re-use of same includes