Initial commit, basic modifications