Moved things around, got events working and table print