Goalie

Some goalie changes, will update further...