Added initial proof of concept