Inital version
Fix bugs
Remove console.log
Remove console.log
Merge branch 'APD-441-BOZ' into develop