Add in tbgrep, rmlog, move some things around.