Update 3/4 - Key functionality working