WIP expect breakage
Some refactoring

Check if follows should now work, but it doesn't update status yet!
First status update!