Most kernel reintroduced - change window buggy - create unit tests...