Refactoring Template code to open a new way for a much modular behavior, should not break anything, bump to 1.2