Added classwork collab with Andrew Fischer (first two funcs are mine)