Working on a big Bat patch request