First real commit, with main class