Progress from this weekend... trying to rip out Thrift