trying to clean this up a little so I can make progress toward gameplay tomorrow