Finished Refactoring Trade
Merge with master
Deactivate Home Flash with first Trade