Started refactoring on Mochi States