First stable commit, still unfinnished