Updated the proof of concept. Relates to #1