Initial commit of working code, but needs better integration