Adding some stuff to working branch.