Almost working now
Single bug with trim timing to deal with