crash commit
semi-working appointments view
merge fix