Added more logic

Model is less dynamic but offers a basis