Moves some thrift stuff around *sigh*