Models

Did work to the models getting closer to real implenentations