stuff i forgot to commit at lunch!