Commiting what I got, apparently lost some stuff...