almost there, testing tomorrow