Just about ready, but doesn't have safety check for random waves