#0005 Add minimal functionality