created more reusuable loosly coupled class, further removed cruft.