Should now be trading properly, also made slightly faster.