WIP version wai
Remove syntaxtic not working code