Adding some new stuff and moved some stuff around.