Usercase 1, heavy changes