First commit after long Unity debug session.