Debug Stuff

started working on changing around patterns to match better, trying to
work on variables not assigning correctly.