Replaced the old definition of solitare with a template and started work on it