Last commit before presentations start

May/may not have fixed bug