Initial proof of concept needs cleaned and docs