Initial impl that seems to be working
Initial impl that seems to be working
Some final cleanup