YAY it works, now clean it up a bit