lots more stuff, a little easier but still messy. Not sure if this is "idiomatic" or what...