proper linking
First real commit