added some more code I've been screwing around with