Expanding to strings as well. Working to fix class-application bugs. UNSTABLE.