still struggling with naming conventions