Updated to better handle block types.
Removed some errant console.logs
Working on Teaifying things.