Move expression into separate header ...

... and start testing it.