Thanks! I rewrote it some, and added yours solution