Scrapping proof of concept for now