loads of refactoring + started adding unit test for wicket web