Making issues 1, 2 and 3 ready to implement