Added create block functionality
Fixed Conflicts