BUILD: hmmm, was thinking about trying to do a setup eclipse thing
WYBS: a little bit of refactoring.