First Basic changes and implementation of model