Steph branch

Last tests added!