expanding models and model handling functions + simple testing script