simple state variables added, needs more work