sprite refactor continues