get the CLI working, move some html around, shorten calendar, retab