Nates feature

I think this is ready now