This needs to be optional somehow.