Major changes, working for milestone v1.0