First draft of the helper
Ready for a test