Initial commit, partialy done