yeee, hence the WIP! need to think of a good way to work out if this is the case