Implement reservation model and functionality
corrected conflicts
fixed conflicts again