Restructured solution and got existing examples working.