Did more work with reservations
Refactored some things because of RubyMine