First attempt at parts 1.3 and 1.4