WIP: hackjob, but maybe working for BS3?