regex needs some work
regex?