First real commit.
Fixed locations