Add basic proof-of-concept code/kludges