Initial commit + added momentary state