done refactoring views, time to do some testing