Finished shortener.  Sorry for the few commits.