Syntax changes
Refractor
Merged some code
Working merge