Added State builder and some more stuff.