Creating the new blocks (Functionality not functional yet)
Merge branch 'dev'