Got POC working. Needs cleanup