Breaking some states; optimalization of init

underway. :D