Added State and Map to base program, including state updates.