Finishes Trade Support

Trading now completely works