More wip hw-3