Crappy commit; added some questions in comments