Finished Trader Roadmap items

Need some testing