Mucking around some more with functions and stuff