we may have to seperate at some point