Initial Fork -- See https://github.com/cabrel/cabrel-catbox/issues/1