Duy's first merge

Merging current works to get ready for build flask app