Debug stuff

Added in and re-enabled a bunch of debug code since beams don't seem to
be working