Implemented states as well. Way more impressive now