Refactor of user reservations. Closes #50