WIP for hacky following system - Needs refactoring in next commit