Moving thigs about
more asserts