New version, start rewriting!
Merging & Debugging new express structure