First commit

Tests working correctly