Move to more light weight snippet solution