moved work to core template for further development