Slacking branch

Merging Dev with Slacking Branch