First pass adding short codes. Still some work to be done.