added ungly string handling that needs to go away