Refactored platform to accomodate X flow
(WIP) Added Core