Many changes, commits all messed up now