Some kludging as I figure this out