Set sender to member and cleaned some stuff up
Updated todo