cleaned up a bit
no persistence ugh