Live Changes April 28

These are a set of changes that were made on the 28th of April, they
look good, still need final approval, but we will probably merge this
branch in, now that it is a total tangent.

Still need feedback though!