Shim code in development. Commiting to show diff and get help