More functional

Down to two unworking parts now!