kill bad spaces
add tying together logic