Refactored some code to use blocks! Interesting..