Still need to fix empty string errors