Second commit, many changes/added