Implemented TODO items 3&6