Keystal model progress (almost done)