Thanks!

A bit of both, sometimes todos have to die I figure, so I just let them fall off the back.