Feature last must haves

Implementation of the last two must haves.