Agree this needs to be more generic :)