Initial appointment class + fixes