Working string parsing and fn changes