Modified some of the stuff to function better, now including a little swt test.
that shouldn't have been commited...