Updated models, integrated swisspy and moved some functions into it, got up to returning patterns in main script