views modified, tests, added, a lot of ununderstandable code