#58 - Continued work on welcoming feature