Well duh catch up commit

I fixed two null pointer/endless recursion errors that I should have
gotten before (ArrayList not instantiated on go and method1 calls method
2 calls method 1 on initial/0 case). Also, waves aren't being counted
yet, I need to add that data processing into the process event. Well
DUH. Have a nice day. I'll get back to work now...