No more loop dependencies. New smooth template structure. Refactoring. Works but needs some cleanup :)