Added functionality... almost there