Recommiting some stuff I left out...